Clarify that we're returning a spin button in the _new function. This

2001-10-27  Anders Carlsson  <andersca@gnu.org>

	* gtk/gtkspinbutton.c (gtk_spin_button_new_with_range):
	Clarify that we're returning a spin button in the _new function.
	This fixes #54097.

diff --git a/ChangeLog b/ChangeLog
index 5449fbd2bc741a489a0d56a1c04687bb566058f2..891879062515d2501530e894b8e883a462185e1c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-10-27  Anders Carlsson  <andersca@gnu.org>
+
+       * gtk/gtkspinbutton.c (gtk_spin_button_new_with_range): 
+       Clarify that we're returning a spin button in the _new function.
+       This fixes #54097.
+       
 Fri Oct 26 20:55:57 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkbutton.c: Revert changes to GTK_RUN_LAST. 
@@ -30,6 +36,7 @@ Fri Oct 26 20:55:57 2001  Owen Taylor  <otaylor@redhat.com>
        * gtk/gtk.def : added the remaining exported functions
 
 2001-10-27  Anders Carlsson  <andersca@gnu.org>
+>>>>>>> 1.2471
 
        * gtk/gtktreeviewcolumn.c (gtk_tree_view_column_set_fixed_width): 
        Add note about width having to be greater than 0. This fixes

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 5449fbd2bc741a489a0d56a1c04687bb566058f2..891879062515d2501530e894b8e883a462185e1c 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,9 @@
+2001-10-27  Anders Carlsson  <andersca@gnu.org>
+
+       * gtk/gtkspinbutton.c (gtk_spin_button_new_with_range): 
+       Clarify that we're returning a spin button in the _new function.
+       This fixes #54097.
+       
 Fri Oct 26 20:55:57 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkbutton.c: Revert changes to GTK_RUN_LAST. 
@@ -30,6 +36,7 @@ Fri Oct 26 20:55:57 2001  Owen Taylor  <otaylor@redhat.com>
        * gtk/gtk.def : added the remaining exported functions
 
 2001-10-27  Anders Carlsson  <andersca@gnu.org>
+>>>>>>> 1.2471
 
        * gtk/gtktreeviewcolumn.c (gtk_tree_view_column_set_fixed_width): 
        Add note about width having to be greater than 0. This fixes

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 5449fbd2bc741a489a0d56a1c04687bb566058f2..891879062515d2501530e894b8e883a462185e1c 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2001-10-27  Anders Carlsson  <andersca@gnu.org>
+
+       * gtk/gtkspinbutton.c (gtk_spin_button_new_with_range): 
+       Clarify that we're returning a spin button in the _new function.
+       This fixes #54097.
+       
 Fri Oct 26 20:55:57 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkbutton.c: Revert changes to GTK_RUN_LAST. 
@@ -30,6 +36,7 @@ Fri Oct 26 20:55:57 2001  Owen Taylor  <otaylor@redhat.com>
        * gtk/gtk.def : added the remaining exported functions
 
 2001-10-27  Anders Carlsson  <andersca@gnu.org>
+>>>>>>> 1.2471
 
        * gtk/gtktreeviewcolumn.c (gtk_tree_view_column_set_fixed_width): 
        Add note about width having to be greater than 0. This fixes

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 5449fbd2bc741a489a0d56a1c04687bb566058f2..891879062515d2501530e894b8e883a462185e1c 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,9 @@
+2001-10-27  Anders Carlsson  <andersca@gnu.org>
+
+       * gtk/gtkspinbutton.c (gtk_spin_button_new_with_range): 
+       Clarify that we're returning a spin button in the _new function.
+       This fixes #54097.
+       
 Fri Oct 26 20:55:57 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkbutton.c: Revert changes to GTK_RUN_LAST. 
@@ -30,6 +36,7 @@ Fri Oct 26 20:55:57 2001  Owen Taylor  <otaylor@redhat.com>
        * gtk/gtk.def : added the remaining exported functions
 
 2001-10-27  Anders Carlsson  <andersca@gnu.org>
+>>>>>>> 1.2471
 
        * gtk/gtktreeviewcolumn.c (gtk_tree_view_column_set_fixed_width): 
        Add note about width having to be greater than 0. This fixes

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 5449fbd2bc741a489a0d56a1c04687bb566058f2..891879062515d2501530e894b8e883a462185e1c 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+2001-10-27  Anders Carlsson  <andersca@gnu.org>
+
+       * gtk/gtkspinbutton.c (gtk_spin_button_new_with_range): 
+       Clarify that we're returning a spin button in the _new function.
+       This fixes #54097.
+       
 Fri Oct 26 20:55:57 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkbutton.c: Revert changes to GTK_RUN_LAST. 
@@ -30,6 +36,7 @@ Fri Oct 26 20:55:57 2001  Owen Taylor  <otaylor@redhat.com>
        * gtk/gtk.def : added the remaining exported functions
 
 2001-10-27  Anders Carlsson  <andersca@gnu.org>
+>>>>>>> 1.2471
 
        * gtk/gtktreeviewcolumn.c (gtk_tree_view_column_set_fixed_width): 
        Add note about width having to be greater than 0. This fixes

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 5449fbd2bc741a489a0d56a1c04687bb566058f2..891879062515d2501530e894b8e883a462185e1c 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+2001-10-27  Anders Carlsson  <andersca@gnu.org>
+
+       * gtk/gtkspinbutton.c (gtk_spin_button_new_with_range): 
+       Clarify that we're returning a spin button in the _new function.
+       This fixes #54097.
+       
 Fri Oct 26 20:55:57 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkbutton.c: Revert changes to GTK_RUN_LAST. 
@@ -30,6 +36,7 @@ Fri Oct 26 20:55:57 2001  Owen Taylor  <otaylor@redhat.com>
        * gtk/gtk.def : added the remaining exported functions
 
 2001-10-27  Anders Carlsson  <andersca@gnu.org>
+>>>>>>> 1.2471
 
        * gtk/gtktreeviewcolumn.c (gtk_tree_view_column_set_fixed_width): 
        Add note about width having to be greater than 0. This fixes

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 5449fbd2bc741a489a0d56a1c04687bb566058f2..891879062515d2501530e894b8e883a462185e1c 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+2001-10-27  Anders Carlsson  <andersca@gnu.org>
+
+       * gtk/gtkspinbutton.c (gtk_spin_button_new_with_range): 
+       Clarify that we're returning a spin button in the _new function.
+       This fixes #54097.
+       
 Fri Oct 26 20:55:57 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkbutton.c: Revert changes to GTK_RUN_LAST. 
@@ -30,6 +36,7 @@ Fri Oct 26 20:55:57 2001  Owen Taylor  <otaylor@redhat.com>
        * gtk/gtk.def : added the remaining exported functions
 
 2001-10-27  Anders Carlsson  <andersca@gnu.org>
+>>>>>>> 1.2471
 
        * gtk/gtktreeviewcolumn.c (gtk_tree_view_column_set_fixed_width): 
        Add note about width having to be greater than 0. This fixes

diff --git a/gtk/gtkspinbutton.c b/gtk/gtkspinbutton.c
index bd53b173e2359dde8d11909e78d8a063248d0e12..c0a2cb0406353d76f59b83f50825cdbab4fede5c 100644 (file)
--- a/gtk/gtkspinbutton.c
+++ b/gtk/gtkspinbutton.c
@@ -1561,7 +1561,7 @@ gtk_spin_button_new (GtkAdjustment *adjustment,
  * is the default. The precision of the spin button is equivalent to the 
  * precision of @step.
  * 
- * Return value: the newly instantiated spin button
+ * Return value: The new spin button as a #GtkWidget.
  **/
 GtkWidget *
 gtk_spin_button_new_with_range (gdouble min,